proto-stream.el (proto-stream-open-tls): Return nil if we don't get any stream.

gnus.texi (Server Commands): Point to the rest of the server commands.

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 5e0c21047f403f81112bf72f5bb2b76e9e6c1f25..6db4c966d75d90e18bb8ea34539efe64a341d36d 100644 (file)
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,8 @@
+2010-12-06  Tassilo Horn  <tassilo@member.fsf.org>
+
+       * gnus.texi (Server Commands): Point to the rest of the server
+       commands.
+
 2010-12-04  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * gnus.texi (Paging the Article): Note the reverse meanings of `C-u C-u

diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index 5b8a0b456831127c80f3ee2a76a584b0663131d1..2df6d90cc07acadb0f1a1fac1531585b5cdc7608 100644 (file)
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -13885,6 +13885,9 @@ hence getting a correct total article count.
 
 @end table
 
+Some more commands for closing, disabling, and re-opening servers are
+listed in @ref{Unavailable Servers}.
+
 
 @node Example Methods
 @subsection Example Methods

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index a56aa9c44bdc93263370d94bfd817bdec3def4da..9c6b31397f31edb1456be006fa5dbf0ec9a993af 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,5 +1,8 @@
 2010-12-06  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+       * proto-stream.el (proto-stream-open-tls): Return nil if we don't get
+       any stream.
+
        * shr.el (shr-tag-font): Colorize the region.
        (shr-tag-body): Ditto.
        (shr-tag-font): Actually let the styles be inherited instead of

diff --git a/lisp/gnus/proto-stream.el b/lisp/gnus/proto-stream.el
index fe764dcf01dd03bf6271b0f6c3cf43ae41ea32dd..6c90f3a112dbb5569a7ed25a039e41596576eeaf 100644 (file)
--- a/lisp/gnus/proto-stream.el
+++ b/lisp/gnus/proto-stream.el
@@ -219,16 +219,18 @@ command to switch on STARTTLS otherwise."
                        'open-gnutls-stream
                      'open-tls-stream)
                    name buffer host service)))
-      ;; If we're using tls.el, we have to delete the output from
-      ;; openssl/gnutls-cli.
-      (unless (fboundp 'open-gnutls-stream)
-       (proto-stream-get-response
-        stream start (proto-stream-eoc parameters))
-       (goto-char (point-min))
-       (when (re-search-forward (proto-stream-eoc parameters) nil t)
-         (goto-char (match-beginning 0))
-         (delete-region (point-min) (line-beginning-position))))
-      (proto-stream-capability-open start stream parameters))))
+      (if (null stream)
+         nil
+       ;; If we're using tls.el, we have to delete the output from
+       ;; openssl/gnutls-cli.
+       (unless (fboundp 'open-gnutls-stream)
+         (proto-stream-get-response
+          stream start (proto-stream-eoc parameters))
+         (goto-char (point-min))
+         (when (re-search-forward (proto-stream-eoc parameters) nil t)
+           (goto-char (match-beginning 0))
+           (delete-region (point-min) (line-beginning-position))))
+       (proto-stream-capability-open start stream parameters)))))
 
 (defun proto-stream-open-shell (name buffer host service parameters)
   (proto-stream-capability-open